convert area_height to pango dimensions after painting the background. We

2001-02-07  Sven Neumann  <sven@convergence.de>

	* gtk/gtkentry.c (gtk_entry_draw_text): convert area_height to
	pango dimensions after painting the background. We used to draw
	gigantic flat boxes here.

diff --git a/ChangeLog b/ChangeLog
index b69f157613c28da3f1b0ed45f72dbc97a25aaecc..3b88af8b9bf21dc613c620da2bdd03855c0da7ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-07  Sven Neumann  <sven@convergence.de>
+
+       * gtk/gtkentry.c (gtk_entry_draw_text): convert area_height to 
+       pango dimensions after painting the background. We used to draw
+       gigantic flat boxes here.
+
 Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b69f157613c28da3f1b0ed45f72dbc97a25aaecc..3b88af8b9bf21dc613c620da2bdd03855c0da7ec 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-02-07  Sven Neumann  <sven@convergence.de>
+
+       * gtk/gtkentry.c (gtk_entry_draw_text): convert area_height to 
+       pango dimensions after painting the background. We used to draw
+       gigantic flat boxes here.
+
 Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b69f157613c28da3f1b0ed45f72dbc97a25aaecc..3b88af8b9bf21dc613c620da2bdd03855c0da7ec 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-02-07  Sven Neumann  <sven@convergence.de>
+
+       * gtk/gtkentry.c (gtk_entry_draw_text): convert area_height to 
+       pango dimensions after painting the background. We used to draw
+       gigantic flat boxes here.
+
 Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b69f157613c28da3f1b0ed45f72dbc97a25aaecc..3b88af8b9bf21dc613c620da2bdd03855c0da7ec 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-02-07  Sven Neumann  <sven@convergence.de>
+
+       * gtk/gtkentry.c (gtk_entry_draw_text): convert area_height to 
+       pango dimensions after painting the background. We used to draw
+       gigantic flat boxes here.
+
 Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b69f157613c28da3f1b0ed45f72dbc97a25aaecc..3b88af8b9bf21dc613c620da2bdd03855c0da7ec 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-02-07  Sven Neumann  <sven@convergence.de>
+
+       * gtk/gtkentry.c (gtk_entry_draw_text): convert area_height to 
+       pango dimensions after painting the background. We used to draw
+       gigantic flat boxes here.
+
 Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b69f157613c28da3f1b0ed45f72dbc97a25aaecc..3b88af8b9bf21dc613c620da2bdd03855c0da7ec 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-02-07  Sven Neumann  <sven@convergence.de>
+
+       * gtk/gtkentry.c (gtk_entry_draw_text): convert area_height to 
+       pango dimensions after painting the background. We used to draw
+       gigantic flat boxes here.
+
 Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b69f157613c28da3f1b0ed45f72dbc97a25aaecc..3b88af8b9bf21dc613c620da2bdd03855c0da7ec 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-02-07  Sven Neumann  <sven@convergence.de>
+
+       * gtk/gtkentry.c (gtk_entry_draw_text): convert area_height to 
+       pango dimensions after painting the background. We used to draw
+       gigantic flat boxes here.
+
 Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index dfc9a816657ffc02ef3fa701e7da8fc3d95882d0..daada4fb7ad5779660d0147843f255877cc2cb32 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1951,7 +1951,6 @@ gtk_entry_draw_text (GtkEntry *entry)
       gint y_pos;
 
       gdk_window_get_size (entry->text_area, &area_width, &area_height);
-      area_height = PANGO_SCALE * (area_height - 2 * INNER_BORDER);
       
       widget = GTK_WIDGET (entry);
 
@@ -1960,6 +1959,8 @@ gtk_entry_draw_text (GtkEntry *entry)
                          NULL, widget, "entry_bg", 
                          0, 0, area_width, area_height);
       
+      area_height = PANGO_SCALE * (area_height - 2 * INNER_BORDER);
+
       line = pango_layout_get_lines (layout)->data;
       pango_layout_line_get_extents (line, NULL, &logical_rect);